Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add COSMOS Event Routing #24

Merged
merged 7 commits into from
Jun 19, 2024
Merged

Add COSMOS Event Routing #24

merged 7 commits into from
Jun 19, 2024

Conversation

Jbsco
Copy link
Collaborator

@Jbsco Jbsco commented Jun 7, 2024

This pull request should follow #18. These changes provide the inter-connectivity required to parse event packets from the Adamant assembly using the socket_event_decoder.py script included with Adamant.

To do this a router is added to the Adamant assembly's COSMOS plugin, which allows parsing of event packets from within the Adamant environment on port 7779. This was tested and found functional on Linux.

Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 7, 2024
@Jbsco Jbsco mentioned this pull request Jun 7, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 7, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 12, 2024
@Jbsco
Copy link
Collaborator Author

Jbsco commented Jun 12, 2024

I've re-based this branch on the upstream after merging #18.

Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 12, 2024
@dinkelk
Copy link
Collaborator

dinkelk commented Jun 13, 2024

Running create_container.sh with this PR breaks python for me:

(.py_env) user@30bb68c8e481:~$ python
Fatal Python error: init_sys_streams: can't initialize sys standard streams
Python runtime state: core initialized
Traceback (most recent call last):
  File "/usr/lib/python3.10/io.py", line 52, in <module>
  File "/home/user/adamant_example/gnd/cosmos/venv/lib/python3.11/site-packages/pip/_vendor/rich/abc.py", line 1, in <module>
ImportError: cannot import name 'ABC' from partially initialized module 'abc' (most likely due to a circular import) (/home/user/adamant_example/gnd/cosmos/venv/lib/python3.11/site-packages/pip/_vendor/rich/abc.py)

I doubt this is the PR's fault though. Will need to dig into this deeper. It is time to update to the new Ubuntu version anyways, so maybe that will fix it.

Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 18, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 18, 2024
@Jbsco
Copy link
Collaborator Author

Jbsco commented Jun 18, 2024

Tested and found functional on Windows using the serial_tcp_bridge.py script.

@Jbsco Jbsco force-pushed the event-routing branch 2 times, most recently from 3c889c8 to c52a898 Compare June 18, 2024 22:02
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 18, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 19, 2024
@Jbsco Jbsco requested a review from dinkelk June 19, 2024 01:37
Fixes to Pico README.md

Apply additional fixes to Pico README.md

Apply fixes for Linux and Pico README.md
@dinkelk dinkelk merged commit 34c563a into lasp:main Jun 19, 2024
5 checks passed
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 19, 2024
@Jbsco Jbsco deleted the event-routing branch June 19, 2024 02:13
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 19, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 19, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 20, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 20, 2024
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 22, 2024
Convert Docker run script to Docker Compose (`docker compose up -d`)

Make `adamant_env.sh` executable

Add all usage args to `adamant_env.sh` output when run with no args

Reword `adamant_env.sh` output to be more approachable to users

Change `stop` arg to stop the container rather than remove

Remove scripts replaced by `adamant_env.sh`

Retain and use `docker_config.sh` for user configuration

Add Docker Compose network mode for changes in lasp#24

Apply `compose.yaml` fixes for Windows

Rename compose.yaml->compose.yml

Update compose.yml to use docker_config.sh vars

Improve `adamant_env.sh` input handling

Convert remaining `docker` commands to `docker-compose`

Fix script `build` arg to function with `docker-compose`
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 22, 2024
Convert Docker run script to Docker Compose (`docker compose up -d`)

Make `adamant_env.sh` executable

Add all usage args to `adamant_env.sh` output when run with no args

Reword `adamant_env.sh` output to be more approachable to users

Change `stop` arg to stop the container rather than remove

Remove scripts replaced by `adamant_env.sh`

Retain and use `docker_config.sh` for user configuration

Add Docker Compose network mode for changes in lasp#24

Apply `compose.yaml` fixes for Windows

Rename compose.yaml->compose.yml

Update compose.yml to use docker_config.sh vars

Improve `adamant_env.sh` input handling

Convert remaining `docker` commands to `docker-compose`

Fix script `build` arg to function with `docker-compose`

Apply fix to to enable `build` and `push`
Jbsco added a commit to Jbsco/adamant_example that referenced this pull request Jun 24, 2024
Convert Docker run script to Docker Compose (`docker compose up -d`)

Make `adamant_env.sh` executable

Add all usage args to `adamant_env.sh` output when run with no args

Reword `adamant_env.sh` output to be more approachable to users

Change `stop` arg to stop the container rather than remove

Remove scripts replaced by `adamant_env.sh`

Retain and use `docker_config.sh` for user configuration

Add Docker Compose network mode for changes in lasp#24

Apply `compose.yaml` fixes for Windows

Rename compose.yaml->compose.yml

Update compose.yml to use docker_config.sh vars

Improve `adamant_env.sh` input handling

Convert remaining `docker` commands to `docker-compose`

Fix script `build` arg to function with `docker-compose`

Apply fix to to enable `build` and `push`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants